Auto merge of #2028 - aarzee:master, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 6 Oct 2015 15:43:24 +0000 (15:43 +0000)
committerbors <bors@rust-lang.org>
Tue, 6 Oct 2015 15:43:24 +0000 (15:43 +0000)
commit86b36d03106f293fe6e4160cc1b41b1a2effa5b3
tree1d1eeae5de7166c69a6042fbf1fe2006e6727eda
parent61952eba7e54cd60f5306cc0d8adc537adc66a3f
parent9f11f2d590879bfdfb04745b3c215bf94a52b63c
Auto merge of #2028 - aarzee:master, r=alexcrichton